From db1eeb065182423d25b4799e132905b28b1d5aa2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Jul 2011 18:38:05 -0400 Subject: [PATCH] Drop gailtextutil from gtk/a11y The last user was GailTextCell, and that can use gtk_pango api instead. --- gtk/a11y/Makefile.am | 2 - gtk/a11y/gailtextcell.c | 151 ++++---- gtk/a11y/gailtextcell.h | 2 - gtk/a11y/gailtextutil.c | 786 ---------------------------------------- gtk/a11y/gailtextutil.h | 87 ----- 5 files changed, 87 insertions(+), 941 deletions(-) delete mode 100644 gtk/a11y/gailtextutil.c delete mode 100644 gtk/a11y/gailtextutil.h diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am index 1842c73239..1743fbbbd4 100644 --- a/gtk/a11y/Makefile.am +++ b/gtk/a11y/Makefile.am @@ -45,7 +45,6 @@ gail_c_sources = \ gtksubmenuitemaccessible.c \ gtkswitchaccessible.c \ gailtextcell.c \ - gailtextutil.c \ gtktextviewaccessible.c \ gtktogglebuttonaccessible.c \ gailtoplevel.c \ @@ -98,7 +97,6 @@ gail_private_h_sources = \ gtksubmenuitemaccessible.h \ gtkswitchaccessible.h \ gailtextcell.h \ - gailtextutil.h \ gtktextviewaccessible.h \ gtktogglebuttonaccessible.h \ gailtoplevel.h \ diff --git a/gtk/a11y/gailtextcell.c b/gtk/a11y/gailtextcell.c index ae88d3cd6c..9a810460d0 100644 --- a/gtk/a11y/gailtextcell.c +++ b/gtk/a11y/gailtextcell.c @@ -20,10 +20,11 @@ #include "config.h" #include #include +#include "../gtkpango.h" #include "gailtextcell.h" #include "gailcontainercell.h" #include "gailcellparent.h" -#include +#include "gailmisc.h" static void gail_text_cell_class_init (GailTextCellClass *klass); static void gail_text_cell_init (GailTextCell *text_cell); @@ -78,8 +79,8 @@ static AtkAttributeSet* gail_text_cell_get_run_attributes static AtkAttributeSet* gail_text_cell_get_default_attributes (AtkText *text); -static PangoLayout* create_pango_layout (GtkCellRendererText *gtk_renderer, - GtkWidget *widget); +static GtkWidget* get_widget (GailTextCell *cell); +static PangoLayout* create_pango_layout (GailTextCell *cell); static void add_attr (PangoAttrList *attr_list, PangoAttribute *attr); @@ -152,7 +153,6 @@ gail_text_cell_init (GailTextCell *text_cell) text_cell->cell_text = NULL; text_cell->caret_pos = 0; text_cell->cell_length = 0; - text_cell->textutil = gail_text_util_new (); atk_state_set_add_state (GAIL_CELL (text_cell)->state_set, ATK_STATE_SINGLE_LINE); } @@ -183,7 +183,6 @@ gail_text_cell_finalize (GObject *object) { GailTextCell *text_cell = GAIL_TEXT_CELL (object); - g_object_unref (text_cell->textutil); g_free (text_cell->cell_text); G_OBJECT_CLASS (gail_text_cell_parent_class)->finalize (object); @@ -255,8 +254,7 @@ gail_text_cell_update_cache (GailRendererCell *cell, } g_free (new_cache); - gail_text_util_text_setup (text_cell->textutil, text_cell->cell_text); - + if (rv) { if (emit_change_signal) @@ -289,50 +287,68 @@ atk_text_interface_init (AtkTextIface *iface) } static gchar* -gail_text_cell_get_text (AtkText *text, +gail_text_cell_get_text (AtkText *atk_text, gint start_pos, gint end_pos) { - if (GAIL_TEXT_CELL (text)->cell_text) - return gail_text_util_get_substring (GAIL_TEXT_CELL (text)->textutil, - start_pos, end_pos); + gchar *text; + + text = GAIL_TEXT_CELL (atk_text)->cell_text; + if (text) + return g_utf8_substring (text, start_pos, end_pos > -1 ? end_pos : g_utf8_strlen (text, -1)); else return g_strdup (""); } static gchar* -gail_text_cell_get_text_before_offset (AtkText *text, +gail_text_cell_get_text_before_offset (AtkText *atk_text, gint offset, AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset) { - return gail_text_util_get_text (GAIL_TEXT_CELL (text)->textutil, - NULL, GAIL_BEFORE_OFFSET, boundary_type, offset, start_offset, - end_offset); + PangoLayout *layout; + gchar *text; + + layout = create_pango_layout (GAIL_TEXT_CELL (atk_text)); + text = _gtk_pango_get_text_before (layout, boundary_type, offset, start_offset, end_offset); + g_object_unref (layout); + + return text; } static gchar* -gail_text_cell_get_text_at_offset (AtkText *text, +gail_text_cell_get_text_at_offset (AtkText *atk_text, gint offset, AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset) { - return gail_text_util_get_text (GAIL_TEXT_CELL (text)->textutil, - NULL, GAIL_AT_OFFSET, boundary_type, offset, start_offset, end_offset); + PangoLayout *layout; + gchar *text; + + layout = create_pango_layout (GAIL_TEXT_CELL (atk_text)); + text = _gtk_pango_get_text_at (layout, boundary_type, offset, start_offset, end_offset); + g_object_unref (layout); + + return text; } static gchar* -gail_text_cell_get_text_after_offset (AtkText *text, +gail_text_cell_get_text_after_offset (AtkText *atk_text, gint offset, AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset) { - return gail_text_util_get_text (GAIL_TEXT_CELL (text)->textutil, - NULL, GAIL_AFTER_OFFSET, boundary_type, offset, start_offset, - end_offset); + PangoLayout *layout; + gchar *text; + + layout = create_pango_layout (GAIL_TEXT_CELL (atk_text)); + text = _gtk_pango_get_text_after (layout, boundary_type, offset, start_offset, end_offset); + g_object_unref (layout); + + return text; } static gint @@ -381,63 +397,66 @@ static AtkAttributeSet* gail_text_cell_get_run_attributes (AtkText *text, gint offset, gint *start_offset, - gint *end_offset) + gint *end_offset) { - GailRendererCell *gail_renderer; - GtkCellRendererText *gtk_renderer; AtkAttributeSet *attrib_set = NULL; PangoLayout *layout; - AtkObject *parent; - GtkWidget *widget; - gchar *renderer_text; - - gail_renderer = GAIL_RENDERER_CELL (text); - gtk_renderer = GTK_CELL_RENDERER_TEXT (gail_renderer->renderer); - parent = atk_object_get_parent (ATK_OBJECT (text)); - if (GAIL_IS_CONTAINER_CELL (parent)) - parent = atk_object_get_parent (parent); - g_return_val_if_fail (GAIL_IS_CELL_PARENT (parent), NULL); - widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent)); - layout = create_pango_layout (gtk_renderer, widget), - g_object_get (gtk_renderer, "text", &renderer_text, NULL); - attrib_set = gail_misc_layout_get_run_attributes (attrib_set, - layout, - renderer_text, - offset, - start_offset, - end_offset); - g_free (renderer_text); + layout = create_pango_layout (GAIL_TEXT_CELL (text)); + attrib_set = _gtk_pango_get_run_attributes (NULL, layout, offset, start_offset, end_offset); g_object_unref (G_OBJECT (layout)); - + return attrib_set; } +static AtkAttributeSet * +add_attribute (AtkAttributeSet *attributes, + AtkTextAttribute attr, + const gchar *value) +{ + AtkAttribute *at; + + at = g_new (AtkAttribute, 1); + at->name = g_strdup (atk_text_attribute_get_name (attr)); + at->value = g_strdup (value); + + return g_slist_prepend (attributes, at); +} + static AtkAttributeSet* gail_text_cell_get_default_attributes (AtkText *text) { - GailRendererCell *gail_renderer; - GtkCellRendererText *gtk_renderer; AtkAttributeSet *attrib_set = NULL; PangoLayout *layout; - AtkObject *parent; GtkWidget *widget; - gail_renderer = GAIL_RENDERER_CELL (text); - gtk_renderer = GTK_CELL_RENDERER_TEXT (gail_renderer->renderer); + layout = create_pango_layout (GAIL_TEXT_CELL (text)); + widget = get_widget (GAIL_TEXT_CELL (text)); + + attrib_set = add_attribute (attrib_set, ATK_TEXT_ATTR_DIRECTION, + atk_text_attribute_get_value (ATK_TEXT_ATTR_DIRECTION, + gtk_widget_get_direction (widget))); + attrib_set = _gtk_pango_get_default_attributes (NULL, layout); + + attrib_set = _gtk_style_context_get_attributes (attrib_set, + gtk_widget_get_style_context (widget), + gtk_widget_get_state_flags (widget)); + + g_object_unref (G_OBJECT (layout)); + + return attrib_set; +} + +GtkWidget * +get_widget (GailTextCell *text) +{ + AtkObject *parent; parent = atk_object_get_parent (ATK_OBJECT (text)); if (GAIL_IS_CONTAINER_CELL (parent)) parent = atk_object_get_parent (parent); - g_return_val_if_fail (GAIL_IS_CELL_PARENT (parent), NULL); - widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent)); - layout = create_pango_layout (gtk_renderer, widget), - attrib_set = gail_misc_get_default_attributes (attrib_set, - layout, - widget); - g_object_unref (G_OBJECT (layout)); - return attrib_set; + return gtk_accessible_get_widget (GTK_ACCESSIBLE (parent)); } /* @@ -447,8 +466,7 @@ gail_text_cell_get_default_attributes (AtkText *text) * one using this function. */ static PangoLayout* -create_pango_layout(GtkCellRendererText *gtk_renderer, - GtkWidget *widget) +create_pango_layout (GailTextCell *text) { GdkRGBA *foreground_rgba; PangoAttrList *attr_list, *attributes; @@ -461,6 +479,11 @@ create_pango_layout(GtkCellRendererText *gtk_renderer, gchar *renderer_text; gdouble scale; gint rise; + GailRendererCell *gail_renderer; + GtkCellRendererText *gtk_renderer; + + gail_renderer = GAIL_RENDERER_CELL (text); + gtk_renderer = GTK_CELL_RENDERER_TEXT (gail_renderer->renderer); g_object_get (gtk_renderer, "text", &renderer_text, @@ -478,7 +501,7 @@ create_pango_layout(GtkCellRendererText *gtk_renderer, "rise", &rise, NULL); - layout = gtk_widget_create_pango_layout (widget, renderer_text); + layout = gtk_widget_create_pango_layout (get_widget (text), renderer_text); if (attributes) attr_list = pango_attr_list_copy (attributes); @@ -615,7 +638,7 @@ gail_text_cell_get_character_extents (AtkText *text, x_offset = MAX (0, xalign * (rendered_rect.width - min_size.width)); y_offset = MAX (0, yalign * (rendered_rect.height - min_size.height)); - layout = create_pango_layout (gtk_renderer, widget); + layout = create_pango_layout (GAIL_TEXT_CELL (text)); index = g_utf8_offset_to_pointer (renderer_text, offset) - renderer_text; pango_layout_index_to_pos (layout, index, &char_rect); @@ -683,7 +706,7 @@ gail_text_cell_get_offset_at_point (AtkText *text, x_offset = MAX (0, xalign * (rendered_rect.width - min_size.width)); y_offset = MAX (0, yalign * (rendered_rect.height - min_size.height)); - layout = create_pango_layout (gtk_renderer, widget); + layout = create_pango_layout (GAIL_TEXT_CELL (text)); gtk_cell_renderer_get_padding (gail_renderer->renderer, &xpad, &ypad); index = gail_misc_get_index_at_point_in_layout (widget, layout, diff --git a/gtk/a11y/gailtextcell.h b/gtk/a11y/gailtextcell.h index b5f8adb4e4..d91ec99c8e 100644 --- a/gtk/a11y/gailtextcell.h +++ b/gtk/a11y/gailtextcell.h @@ -22,7 +22,6 @@ #include #include "gailrenderercell.h" -#include "gailtextutil.h" G_BEGIN_DECLS @@ -39,7 +38,6 @@ typedef struct _GailTextCellClass GailTextCellClass; struct _GailTextCell { GailRendererCell parent; - GailTextUtil *textutil; gchar *cell_text; gint caret_pos; gint cell_length; diff --git a/gtk/a11y/gailtextutil.c b/gtk/a11y/gailtextutil.c deleted file mode 100644 index 2aec642c65..0000000000 --- a/gtk/a11y/gailtextutil.c +++ /dev/null @@ -1,786 +0,0 @@ -/* GAIL - The GNOME Accessibility Implementation Library - * Copyright 2001 Sun Microsystems Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include -#include "gailtextutil.h" - -/** - * SECTION:gailtextutil - * @Short_description: GailTextUtil is a utility class which can be used to - * implement some of the #AtkText functions for accessible objects - * which implement #AtkText. - * @Title: GailTextUtil - * - * GailTextUtil is a utility class which can be used to implement the - * #AtkText functions which get text for accessible objects which implement - * #AtkText. - * - * In GAIL it is used by the accessible objects for #GtkEntry, - * #GtkLabel, #GtkCellRendererText and #GtkTextView. - */ - -static void gail_text_util_class_init (GailTextUtilClass *klass); - -static void gail_text_util_init (GailTextUtil *textutil); -static void gail_text_util_finalize (GObject *object); - - -static void get_pango_text_offsets (PangoLayout *layout, - GtkTextBuffer *buffer, - GailOffsetType function, - AtkTextBoundary boundary_type, - gint offset, - gint *start_offset, - gint *end_offset, - GtkTextIter *start_iter, - GtkTextIter *end_iter); -static GObjectClass *parent_class = NULL; - -GType -gail_text_util_get_type(void) -{ - static GType type = 0; - - if (!type) - { - const GTypeInfo tinfo = - { - sizeof (GailTextUtilClass), - (GBaseInitFunc) NULL, /* base init */ - (GBaseFinalizeFunc) NULL, /* base finalize */ - (GClassInitFunc) gail_text_util_class_init, - (GClassFinalizeFunc) NULL, /* class finalize */ - NULL, /* class data */ - sizeof(GailTextUtil), - 0, /* nb preallocs */ - (GInstanceInitFunc) gail_text_util_init, - NULL, /* value table */ - }; - - type = g_type_register_static (G_TYPE_OBJECT, "GailTextUtil", &tinfo, 0); - } - return type; -} - -/** - * gail_text_util_new: - * - * This function creates a new GailTextUtil object. - * - * Returns: the GailTextUtil object - **/ -GailTextUtil* -gail_text_util_new (void) -{ - return GAIL_TEXT_UTIL (g_object_new (GAIL_TYPE_TEXT_UTIL, NULL)); -} - -static void -gail_text_util_init (GailTextUtil *textutil) -{ - textutil->buffer = NULL; -} - -static void -gail_text_util_class_init (GailTextUtilClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - parent_class = g_type_class_peek_parent (klass); - - gobject_class->finalize = gail_text_util_finalize; -} - -static void -gail_text_util_finalize (GObject *object) -{ - GailTextUtil *textutil = GAIL_TEXT_UTIL (object); - - if (textutil->buffer) - g_object_unref (textutil->buffer); - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - -/** - * gail_text_util_text_setup: - * @textutil: The #GailTextUtil to be initialized. - * @text: A gchar* which points to the text to be stored in the GailTextUtil - * - * This function initializes the GailTextUtil with the specified character string, - **/ -void -gail_text_util_text_setup (GailTextUtil *textutil, - const gchar *text) -{ - g_return_if_fail (GAIL_IS_TEXT_UTIL (textutil)); - - if (textutil->buffer) - { - if (!text) - { - g_object_unref (textutil->buffer); - textutil->buffer = NULL; - return; - } - } - else - { - textutil->buffer = gtk_text_buffer_new (NULL); - } - - gtk_text_buffer_set_text (textutil->buffer, text, -1); -} - -/** - * gail_text_util_buffer_setup: - * @textutil: A #GailTextUtil to be initialized - * @buffer: The #GtkTextBuffer which identifies the text to be stored in the GailUtil. - * - * This function initializes the GailTextUtil with the specified GtkTextBuffer - **/ -void -gail_text_util_buffer_setup (GailTextUtil *textutil, - GtkTextBuffer *buffer) -{ - g_return_if_fail (GAIL_IS_TEXT_UTIL (textutil)); - - textutil->buffer = g_object_ref (buffer); -} - -/** - * gail_text_util_get_text: - * @textutil: A #GailTextUtil - * @layout: A gpointer which is a PangoLayout, a GtkTreeView of NULL - * @function: An enumeration specifying whether to return the text before, at, or - * after the offset. - * @boundary_type: The boundary type. - * @offset: The offset of the text in the GailTextUtil - * @start_offset: Address of location in which the start offset is returned - * @end_offset: Address of location in which the end offset is returned - * - * This function gets the requested substring from the text in the GtkTextUtil. - * The layout is used only for getting the text on a line. The value is NULL - * for a GtkTextView which is not wrapped, is a GtkTextView for a GtkTextView - * which is wrapped and is a PangoLayout otherwise. - * - * Returns: the substring requested - **/ -gchar* -gail_text_util_get_text (GailTextUtil *textutil, - gpointer layout, - GailOffsetType function, - AtkTextBoundary boundary_type, - gint offset, - gint *start_offset, - gint *end_offset) -{ - GtkTextIter start, end; - gint line_number; - GtkTextBuffer *buffer; - - g_return_val_if_fail (GAIL_IS_TEXT_UTIL (textutil), NULL); - - buffer = textutil->buffer; - if (buffer == NULL) - { - *start_offset = 0; - *end_offset = 0; - return NULL; - } - - if (!gtk_text_buffer_get_char_count (buffer)) - { - *start_offset = 0; - *end_offset = 0; - return g_strdup (""); - } - gtk_text_buffer_get_iter_at_offset (buffer, &start, offset); - - - end = start; - - switch (function) - { - case GAIL_BEFORE_OFFSET: - switch (boundary_type) - { - case ATK_TEXT_BOUNDARY_CHAR: - gtk_text_iter_backward_char(&start); - break; - case ATK_TEXT_BOUNDARY_WORD_START: - if (!gtk_text_iter_starts_word (&start)) - gtk_text_iter_backward_word_start (&start); - end = start; - gtk_text_iter_backward_word_start(&start); - break; - case ATK_TEXT_BOUNDARY_WORD_END: - if (gtk_text_iter_inside_word (&start) && - !gtk_text_iter_starts_word (&start)) - gtk_text_iter_backward_word_start (&start); - while (!gtk_text_iter_ends_word (&start)) - { - if (!gtk_text_iter_backward_char (&start)) - break; - } - end = start; - gtk_text_iter_backward_word_start(&start); - while (!gtk_text_iter_ends_word (&start)) - { - if (!gtk_text_iter_backward_char (&start)) - break; - } - break; - case ATK_TEXT_BOUNDARY_SENTENCE_START: - if (!gtk_text_iter_starts_sentence (&start)) - gtk_text_iter_backward_sentence_start (&start); - end = start; - gtk_text_iter_backward_sentence_start (&start); - break; - case ATK_TEXT_BOUNDARY_SENTENCE_END: - if (gtk_text_iter_inside_sentence (&start) && - !gtk_text_iter_starts_sentence (&start)) - gtk_text_iter_backward_sentence_start (&start); - while (!gtk_text_iter_ends_sentence (&start)) - { - if (!gtk_text_iter_backward_char (&start)) - break; - } - end = start; - gtk_text_iter_backward_sentence_start (&start); - while (!gtk_text_iter_ends_sentence (&start)) - { - if (!gtk_text_iter_backward_char (&start)) - break; - } - break; - case ATK_TEXT_BOUNDARY_LINE_START: - if (layout == NULL) - { - line_number = gtk_text_iter_get_line (&start); - if (line_number == 0) - { - gtk_text_buffer_get_iter_at_offset (buffer, - &start, 0); - } - else - { - gtk_text_iter_backward_line (&start); - gtk_text_iter_forward_line (&start); - } - end = start; - gtk_text_iter_backward_line (&start); - } - else if GTK_IS_TEXT_VIEW (layout) - { - GtkTextView *view = GTK_TEXT_VIEW (layout); - - gtk_text_view_backward_display_line_start (view, &start); - end = start; - gtk_text_view_backward_display_line (view, &start); - } - else if (PANGO_IS_LAYOUT (layout)) - get_pango_text_offsets (PANGO_LAYOUT (layout), - buffer, - function, - boundary_type, - offset, - start_offset, - end_offset, - &start, - &end); - break; - case ATK_TEXT_BOUNDARY_LINE_END: - if (layout == NULL) - { - line_number = gtk_text_iter_get_line (&start); - if (line_number == 0) - { - gtk_text_buffer_get_iter_at_offset (buffer, - &start, 0); - end = start; - } - else - { - gtk_text_iter_backward_line (&start); - end = start; - while (!gtk_text_iter_ends_line (&start)) - { - if (!gtk_text_iter_backward_char (&start)) - break; - } - gtk_text_iter_forward_to_line_end (&end); - } - } - else if GTK_IS_TEXT_VIEW (layout) - { - GtkTextView *view = GTK_TEXT_VIEW (layout); - - gtk_text_view_backward_display_line_start (view, &start); - if (!gtk_text_iter_is_start (&start)) - { - gtk_text_view_backward_display_line (view, &start); - end = start; - if (!gtk_text_iter_is_start (&start)) - { - gtk_text_view_backward_display_line (view, &start); - gtk_text_view_forward_display_line_end (view, &start); - } - gtk_text_view_forward_display_line_end (view, &end); - } - else - { - end = start; - } - } - else if (PANGO_IS_LAYOUT (layout)) - get_pango_text_offsets (PANGO_LAYOUT (layout), - buffer, - function, - boundary_type, - offset, - start_offset, - end_offset, - &start, - &end); - break; - } - break; - - case GAIL_AT_OFFSET: - switch (boundary_type) - { - case ATK_TEXT_BOUNDARY_CHAR: - gtk_text_iter_forward_char (&end); - break; - case ATK_TEXT_BOUNDARY_WORD_START: - if (!gtk_text_iter_starts_word (&start)) - gtk_text_iter_backward_word_start (&start); - if (gtk_text_iter_inside_word (&end)) - gtk_text_iter_forward_word_end (&end); - while (!gtk_text_iter_starts_word (&end)) - { - if (!gtk_text_iter_forward_char (&end)) - break; - } - break; - case ATK_TEXT_BOUNDARY_WORD_END: - if (gtk_text_iter_inside_word (&start) && - !gtk_text_iter_starts_word (&start)) - gtk_text_iter_backward_word_start (&start); - while (!gtk_text_iter_ends_word (&start)) - { - if (!gtk_text_iter_backward_char (&start)) - break; - } - gtk_text_iter_forward_word_end (&end); - break; - case ATK_TEXT_BOUNDARY_SENTENCE_START: - if (!gtk_text_iter_starts_sentence (&start)) - gtk_text_iter_backward_sentence_start (&start); - if (gtk_text_iter_inside_sentence (&end)) - gtk_text_iter_forward_sentence_end (&end); - while (!gtk_text_iter_starts_sentence (&end)) - { - if (!gtk_text_iter_forward_char (&end)) - break; - } - break; - case ATK_TEXT_BOUNDARY_SENTENCE_END: - if (gtk_text_iter_inside_sentence (&start) && - !gtk_text_iter_starts_sentence (&start)) - gtk_text_iter_backward_sentence_start (&start); - while (!gtk_text_iter_ends_sentence (&start)) - { - if (!gtk_text_iter_backward_char (&start)) - break; - } - gtk_text_iter_forward_sentence_end (&end); - break; - case ATK_TEXT_BOUNDARY_LINE_START: - if (layout == NULL) - { - line_number = gtk_text_iter_get_line (&start); - if (line_number == 0) - { - gtk_text_buffer_get_iter_at_offset (buffer, - &start, 0); - } - else - { - gtk_text_iter_backward_line (&start); - gtk_text_iter_forward_line (&start); - } - gtk_text_iter_forward_line (&end); - } - else if GTK_IS_TEXT_VIEW (layout) - { - GtkTextView *view = GTK_TEXT_VIEW (layout); - - gtk_text_view_backward_display_line_start (view, &start); - /* - * The call to gtk_text_iter_forward_to_end() is needed - * because of bug 81960 - */ - if (!gtk_text_view_forward_display_line (view, &end)) - gtk_text_iter_forward_to_end (&end); - } - else if PANGO_IS_LAYOUT (layout) - get_pango_text_offsets (PANGO_LAYOUT (layout), - buffer, - function, - boundary_type, - offset, - start_offset, - end_offset, - &start, - &end); - - break; - case ATK_TEXT_BOUNDARY_LINE_END: - if (layout == NULL) - { - line_number = gtk_text_iter_get_line (&start); - if (line_number == 0) - { - gtk_text_buffer_get_iter_at_offset (buffer, - &start, 0); - } - else - { - gtk_text_iter_backward_line (&start); - gtk_text_iter_forward_line (&start); - } - while (!gtk_text_iter_ends_line (&start)) - { - if (!gtk_text_iter_backward_char (&start)) - break; - } - gtk_text_iter_forward_to_line_end (&end); - } - else if GTK_IS_TEXT_VIEW (layout) - { - GtkTextView *view = GTK_TEXT_VIEW (layout); - - gtk_text_view_backward_display_line_start (view, &start); - if (!gtk_text_iter_is_start (&start)) - { - gtk_text_view_backward_display_line (view, &start); - gtk_text_view_forward_display_line_end (view, &start); - } - gtk_text_view_forward_display_line_end (view, &end); - } - else if PANGO_IS_LAYOUT (layout) - get_pango_text_offsets (PANGO_LAYOUT (layout), - buffer, - function, - boundary_type, - offset, - start_offset, - end_offset, - &start, - &end); - break; - } - break; - - case GAIL_AFTER_OFFSET: - switch (boundary_type) - { - case ATK_TEXT_BOUNDARY_CHAR: - gtk_text_iter_forward_char(&start); - gtk_text_iter_forward_chars(&end, 2); - break; - case ATK_TEXT_BOUNDARY_WORD_START: - if (gtk_text_iter_inside_word (&end)) - gtk_text_iter_forward_word_end (&end); - while (!gtk_text_iter_starts_word (&end)) - { - if (!gtk_text_iter_forward_char (&end)) - break; - } - start = end; - if (!gtk_text_iter_is_end (&end)) - { - gtk_text_iter_forward_word_end (&end); - while (!gtk_text_iter_starts_word (&end)) - { - if (!gtk_text_iter_forward_char (&end)) - break; - } - } - break; - case ATK_TEXT_BOUNDARY_WORD_END: - gtk_text_iter_forward_word_end (&end); - start = end; - if (!gtk_text_iter_is_end (&end)) - gtk_text_iter_forward_word_end (&end); - break; - case ATK_TEXT_BOUNDARY_SENTENCE_START: - if (gtk_text_iter_inside_sentence (&end)) - gtk_text_iter_forward_sentence_end (&end); - while (!gtk_text_iter_starts_sentence (&end)) - { - if (!gtk_text_iter_forward_char (&end)) - break; - } - start = end; - if (!gtk_text_iter_is_end (&end)) - { - gtk_text_iter_forward_sentence_end (&end); - while (!gtk_text_iter_starts_sentence (&end)) - { - if (!gtk_text_iter_forward_char (&end)) - break; - } - } - break; - case ATK_TEXT_BOUNDARY_SENTENCE_END: - gtk_text_iter_forward_sentence_end (&end); - start = end; - if (!gtk_text_iter_is_end (&end)) - gtk_text_iter_forward_sentence_end (&end); - break; - case ATK_TEXT_BOUNDARY_LINE_START: - if (layout == NULL) - { - gtk_text_iter_forward_line (&end); - start = end; - gtk_text_iter_forward_line (&end); - } - else if GTK_IS_TEXT_VIEW (layout) - { - GtkTextView *view = GTK_TEXT_VIEW (layout); - - gtk_text_view_forward_display_line (view, &end); - start = end; - gtk_text_view_forward_display_line (view, &end); - } - else if (PANGO_IS_LAYOUT (layout)) - get_pango_text_offsets (PANGO_LAYOUT (layout), - buffer, - function, - boundary_type, - offset, - start_offset, - end_offset, - &start, - &end); - break; - case ATK_TEXT_BOUNDARY_LINE_END: - if (layout == NULL) - { - gtk_text_iter_forward_line (&start); - end = start; - if (!gtk_text_iter_is_end (&start)) - { - while (!gtk_text_iter_ends_line (&start)) - { - if (!gtk_text_iter_backward_char (&start)) - break; - } - gtk_text_iter_forward_to_line_end (&end); - } - } - else if GTK_IS_TEXT_VIEW (layout) - { - GtkTextView *view = GTK_TEXT_VIEW (layout); - - gtk_text_view_forward_display_line_end (view, &end); - start = end; - gtk_text_view_forward_display_line (view, &end); - gtk_text_view_forward_display_line_end (view, &end); - } - else if (PANGO_IS_LAYOUT (layout)) - get_pango_text_offsets (PANGO_LAYOUT (layout), - buffer, - function, - boundary_type, - offset, - start_offset, - end_offset, - &start, - &end); - break; - } - break; - } - *start_offset = gtk_text_iter_get_offset (&start); - *end_offset = gtk_text_iter_get_offset (&end); - - return gtk_text_buffer_get_text (buffer, &start, &end, FALSE); -} - -/** - * gail_text_util_get_substring: - * @textutil: A #GailTextUtil - * @start_pos: The start position of the substring - * @end_pos: The end position of the substring. - * - * Gets the substring indicated by @start_pos and @end_pos - * - * Returns: the substring indicated by @start_pos and @end_pos - **/ -gchar* -gail_text_util_get_substring (GailTextUtil *textutil, - gint start_pos, - gint end_pos) -{ - GtkTextIter start, end; - GtkTextBuffer *buffer; - - g_return_val_if_fail(GAIL_IS_TEXT_UTIL (textutil), NULL); - - buffer = textutil->buffer; - if (buffer == NULL) - return NULL; - - gtk_text_buffer_get_iter_at_offset (buffer, &start, start_pos); - if (end_pos < 0) - gtk_text_buffer_get_end_iter (buffer, &end); - else - gtk_text_buffer_get_iter_at_offset (buffer, &end, end_pos); - - return gtk_text_buffer_get_text (buffer, &start, &end, FALSE); -} - -static void -get_pango_text_offsets (PangoLayout *layout, - GtkTextBuffer *buffer, - GailOffsetType function, - AtkTextBoundary boundary_type, - gint offset, - gint *start_offset, - gint *end_offset, - GtkTextIter *start_iter, - GtkTextIter *end_iter) -{ - PangoLayoutIter *iter; - PangoLayoutLine *line, *prev_line = NULL, *prev_prev_line = NULL; - gint index, start_index, end_index; - const gchar *text; - gboolean found = FALSE; - - text = pango_layout_get_text (layout); - index = g_utf8_offset_to_pointer (text, offset) - text; - iter = pango_layout_get_iter (layout); - do - { - line = pango_layout_iter_get_line (iter); - start_index = line->start_index; - end_index = start_index + line->length; - - if (index >= start_index && index <= end_index) - { - /* - * Found line for offset - */ - switch (function) - { - case GAIL_BEFORE_OFFSET: - /* - * We want the previous line - */ - if (prev_line) - { - switch (boundary_type) - { - case ATK_TEXT_BOUNDARY_LINE_START: - end_index = start_index; - start_index = prev_line->start_index; - break; - case ATK_TEXT_BOUNDARY_LINE_END: - if (prev_prev_line) - start_index = prev_prev_line->start_index + - prev_prev_line->length; - end_index = prev_line->start_index + prev_line->length; - break; - default: - g_assert_not_reached(); - } - } - else - start_index = end_index = 0; - break; - case GAIL_AT_OFFSET: - switch (boundary_type) - { - case ATK_TEXT_BOUNDARY_LINE_START: - if (pango_layout_iter_next_line (iter)) - end_index = pango_layout_iter_get_line (iter)->start_index; - break; - case ATK_TEXT_BOUNDARY_LINE_END: - if (prev_line) - start_index = prev_line->start_index + - prev_line->length; - break; - default: - g_assert_not_reached(); - } - break; - case GAIL_AFTER_OFFSET: - /* - * We want the next line - */ - if (pango_layout_iter_next_line (iter)) - { - line = pango_layout_iter_get_line (iter); - switch (boundary_type) - { - case ATK_TEXT_BOUNDARY_LINE_START: - start_index = line->start_index; - if (pango_layout_iter_next_line (iter)) - end_index = pango_layout_iter_get_line (iter)->start_index; - else - end_index = start_index + line->length; - break; - case ATK_TEXT_BOUNDARY_LINE_END: - start_index = end_index; - end_index = line->start_index + line->length; - break; - default: - g_assert_not_reached(); - } - } - else - start_index = end_index; - break; - } - found = TRUE; - break; - } - prev_prev_line = prev_line; - prev_line = line; - } - while (pango_layout_iter_next_line (iter)); - - if (!found) - { - start_index = prev_line->start_index + prev_line->length; - end_index = start_index; - } - pango_layout_iter_free (iter); - *start_offset = g_utf8_pointer_to_offset (text, text + start_index); - *end_offset = g_utf8_pointer_to_offset (text, text + end_index); - - gtk_text_buffer_get_iter_at_offset (buffer, start_iter, *start_offset); - gtk_text_buffer_get_iter_at_offset (buffer, end_iter, *end_offset); -} diff --git a/gtk/a11y/gailtextutil.h b/gtk/a11y/gailtextutil.h deleted file mode 100644 index b8b916a165..0000000000 --- a/gtk/a11y/gailtextutil.h +++ /dev/null @@ -1,87 +0,0 @@ -/* GAIL - The GNOME Accessibility Implementation Library - * Copyright 2001 Sun Microsystems Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GAIL_TEXT_UTIL_H__ -#define __GAIL_TEXT_UTIL_H__ - -#include -#include - -G_BEGIN_DECLS - -#define GAIL_TYPE_TEXT_UTIL (gail_text_util_get_type ()) -#define GAIL_TEXT_UTIL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TEXT_UTIL, GailTextUtil)) -#define GAIL_TEXT_UTIL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_TEXT_UTIL, GailTextUtilClass)) -#define GAIL_IS_TEXT_UTIL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_TEXT_UTIL)) -#define GAIL_IS_TEXT_UTIL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_TEXT_UTIL)) -#define GAIL_TEXT_UTIL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_TEXT_UTIL, GailTextUtilClass)) - -/** - *GailOffsetType: - *@GAIL_BEFORE_OFFSET: Text before offset is required. - *@GAIL_AT_OFFSET: Text at offset is required, - *@GAIL_AFTER_OFFSET: Text after offset is required. - * - * Specifies which of the functions atk_text_get_text_before_offset(), - * atk_text_get_text_at_offset(), atk_text_get_text_after_offset() the - * function gail_text_util_get_text() is being called for. - **/ -typedef enum -{ - GAIL_BEFORE_OFFSET, - GAIL_AT_OFFSET, - GAIL_AFTER_OFFSET -}GailOffsetType; - -typedef struct _GailTextUtil GailTextUtil; -typedef struct _GailTextUtilClass GailTextUtilClass; - -struct _GailTextUtil -{ - GObject parent; - - GtkTextBuffer *buffer; -}; - -struct _GailTextUtilClass -{ - GObjectClass parent_class; -}; - -GType gail_text_util_get_type (void); -GailTextUtil* gail_text_util_new (void); - -void gail_text_util_text_setup (GailTextUtil *textutil, - const gchar *text); -void gail_text_util_buffer_setup (GailTextUtil *textutil, - GtkTextBuffer *buffer); -gchar* gail_text_util_get_text (GailTextUtil *textutil, - gpointer layout, - GailOffsetType function, - AtkTextBoundary boundary_type, - gint offset, - gint *start_offset, - gint *end_offset); -gchar* gail_text_util_get_substring (GailTextUtil *textutil, - gint start_pos, - gint end_pos); - -G_END_DECLS - -#endif /*__GAIL_TEXT_UTIL_H__ */ -- 2.30.2